Fix original behavior.