fixing for johnson's server