solved some bug at the admin side