Issue 12 fixed