Closes #232 a dirty fix but works :)