Finally fixed! (?)