bugfix to 1.2