fixes following rdvn