Fixed Customization Mess-up