Fixed annoying clientside issue, thanks Verrazano