ClientView Fix