Possible solution to ticket #55