Fixed the bug "again" :P