Reselto issue #23