Critical bugfix #167