Two to fix in #6