new bug made by earlier fix. \o/