Fixed #131, thanks to @marioskourtesis for reporting