better cover handling