proposed implementation of #123