Fixed some status bugs
Uodated to V3.6.1