Fixed a mess