Applied https://sourceforge.net/p/liborigin/bugs/18/
Applied https://sourceforge.net/p/liborigin/bugs/19/
Fixed https://sourceforge.net/p/liborigin/bugs/21/