hopefully fixed all desync issues

fixes hopefully desyncs