issue002 fixed