Partial fix for Halloween '14