Fixed another clusterfuck