stage04 issue fix