- fix for #443 and solution for #439

Fixes 443 and solves 439.