fixed server side checks