Bugfix: 0 and None treated the same