fixes for pull #33