Issue 27 fixed