enhancer support. fixes #26