Fixes pull299