dmeyer on hotfix