fixed cases for freewheel plugin