Fix override bug