fixed issue 409