Close issue #437