resolve both aspects of #6