Fixed Crazy Stupid Merge