Issue 27 bugfix