prep to fix #3