Aaaand fixed the bug due to my fix