Fixed bug: https://www.bugsense.com/dashboard/project/cdc7bdaf/errors/221708045