merge fix

sorry @lfryc merged in the wrong part in the #373 PR tried to fix in on master but @abstractj didn't let me, he wants @lholmquist to look at it as well