fix for https://github.com/hoodiehq/bugs/issues/3 and