I knew i'd forget something; fixes #2