Fixing bug in last commit. This wasn't meant to move out yet... #3