bug fix
Merge git://github.com/AlloVince/eva-engine into epic
bug fix