Critical bugfix update