Improving the implementation of #9