Fix broken meta close
Fix merge