Update according to review in issue #1159

/cc @samuelgruetter