added fix for 2517
Merge branch 'master' of https://github.com/bvds/LaitsV3