Bugfix for version 1.02