Added fix for END_OF_RESULT in conversion calls.