fixes issue 1 (resolve issue: resolution=RESOLVED