Fixed Compatibility Bug