Fix: Implements the way it is in master.