fixed custom mappings for @warnerandy