further fixes #162