better solution to ticket 1455