Addition to fixes for #831 (#833)
Created by: ikedas
Check for some variables were too restrictive. And some small fixes.
This may fix #841 (closed).
Created by: ikedas
Check for some variables were too restrictive. And some small fixes.
This may fix #841 (closed).