Issue 4 bugfix