Fix after PR #491 after #490

baby steps