fixing server code
Merge branch 'zook_fix' of https://github.com/efruchter/Trait into zook_fix