Fixed bugs: https://www.bugsense.com/dashboard/project/cdc7bdaf/errors/280408330