Should fix #3

Need to test. Dunno if it will really works.
C++ Theory 8D