fixes after merge of PR #16