fixes for ticket #14