fix: syntax error
fix: loading mask fix
Merge branch 'bugfixes' into develop