Fixed a clusterfuck