Another fix for #250
Merge branch 'master' of https://github.com/wisdom-framework/wisdom