added the hotfixes