Hopefully fixed the WS2 issues