fixes for ticket #34