[FIX] Fixes #2252
Merge pull request #2254 from MPOS/issue-2252

[FIX] Fixes #2252