ugly plugins from 1.0.7 tag