fixes for issues #437 and #441