fixes for pull #13