added a more complex condition on bypassMappers to fix the failing acceptance spec
added some comment on the previous code