FINALLY Fixed #20 Fix & its Fix

tested now ^^