bugfix for 1.1