Don't cutoff meta-data being set!!!

Change-Id: I108700b9326f773c600f58f32b8e7ff4aec6b6d7