Fixed Customization Issue