Narrowing down #933