Additional fix #401.