Fix for empty metadata