bug fixes continued (#1896)