fix issue #777: the problem is easily repetible, I found out some coding...

fix issue #777: the problem is easily repetible, I found out some coding issues that could cause problems but not sure this will solve (#799)