issue #8 seems to be fixed (need further testing though), and all it took was 3 lines of code, wow!