#32 Fix verified on Linux and Windows