fixed more clientside checking