critical bugfix