fixes for ticket #3