Fixed old bug since Sun Dec 8, commit d28a475f3ea59e429ce230dd61339d0e53b265fa
The bug could be tested on RunSample001 test