Should fix #160
But unable to test at this time, so please let me know, @nexbr.