Another fix attempt.
Merge branch 'master' of github.com:ianaldrighetti/lmmvc