Fix some wrong behavior