fix fatal error from overlooked merge prompts

Hi David, just updated my fork to the latest master and found what must be an overlooked merge prompt.

Cheers, Christian