FIX for issue 1027 - updated code base to use appropriate result

update code to base so that it is using the appropriate result (remark or original) instead of always using the original

fixes issue #1027