two to fix in #6