Bugfix for corner case (in 0.9.1)