Could we not avoid this by adding a simple `where` clause?