Hotfix (6/9/14)