fixed issue 27