Change to originally intended behavior