make defining slightly easier
merge from upstream