Follow up on #303

Some additional comments can be found on #303