Fixed client-side bug (again, thanks to bobbybeescratcher)