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