Fix #15 thanks to @togakangaroo