Fixed bug

Fixed bug
Merge branch '3.0.2' of https://github.com/ecomfe/ef into 3.0.2