Fixed Client display bug