Separate DLL done
fix bug