[FIX] Really fixed issue #1 :)