Yes. Thanks @jgmize. Forgot to write this yesterday. To be clear: I (we) think this method should not be altered from its original state.