HIVE-4605, Fixed 'Unable to rename output...' error