Finally no more bun/dog mismatch problems!