fixes for pull #9