FIXED JENKINS-19943 but credit should go to Nathan Kinder