Issue 21 fixed