Resynchronized with simple plugin from 1.0.8