try to make a temporary fix for the issue in the normal mode (issue #231)