See discussion on #395