Fixes: #1778 switching baseMode off