Fixed #132, thanks to @marioskourtesis for reporting