Bug fix #392 proper fix, previous was incorrect