fixed issue 257 (resolve issue: resolution=RESOLVED status=Done)