fixes for ticket #33