Tentative fix for #4037, unable to reproduce runtime to check.
Merge branch 'master' of https://github.com/Zuhayr/Baystation12