fixed issue 318