Hotfixing for release