finish fix for #1097