Adding hotfixs.