Fixed issue with metadata contaminating data