Addresses #448, no fix but a new test