finally fixed enhancers