Bug Fix pre-loading Metadata