Fix hodgepodge behavior.