Oops! Fix bug introduced in my recent cleanup change. Thanks to Tobias Grosser