added hotFix method