merge update for issue #437