Fixes #198, there was a bug within a solution to #178