line 107 bugfix