Fixes issue #2 (resolve issue: resolution=RESOLVED)