fixes for ticket #26