432 work
issue432: test solution (limited + maybe wrong)
issue432 possible fix
432 more fixes
Merge branch 'issue432' into develop