critical bugfix.