Fix after PR #490

Seems my PR #490 had a bit more errors than expected