bug fix

fixing damn bug due to all this squashing all over the place