Fix point 1
https://github.com/mattyx14/otxserver/issues/28