bug fix on admin side