Please make the change that I have told you in my former comments and see if the system works well after the modifications are applied. As I mentioned, it is hard to check everything and find all the problems (if there are other problems than this) easily and therefore, you have to do it step by step.