Fixing #545.