I wanted to keep the previous behaviour as much as possible, to keep the risk of actually braking something, as low as possible :)