Fix Issue #300

Another thanks to @Raggyx