Bugfix that caused infinite loop.
Release 0.3.6