First pass to fix #4