Critical bugfix