Face and orientation fix #1