Added Starling's simple trick to avoid the state changes. Updated on Feathers V1.1