visual changes, fix #601