bugfix of 1.23