Patching hot fix again in a more reliable way