fixed issue 336