Fixing thylacine's fixes :)