Fixed Brandon's mess