fix #1108 and identation