fixes for ticket #35