Fixed mis-amalgamation in 8bf6d69925