fixes for ticket #9