Additional fix to #973 & #997 (#969)
Created by: ikedas
This may fix #1016 (closed). This may fix #969 (closed), in combination with #973 & #997 .
Created by: ikedas
This may fix #1016 (closed). This may fix #969 (closed), in combination with #973 & #997 .