Issue 169 - Enhancer fix