Please, change this stupid decision