fix 1238. Fix other error at commit 9405d17