CM11 Support Bugfix.