Critical bugfix #106