Bugfix for 1.2.1