Fixed, I hope.
Merge branch 'hotfix/JJL_Hot_Fix'