Bugfix.
Merge commit '7e3b9275a4f8f04661106e0eb4ca5b98b217a7a5' into lms