Fix to actually made it works properly.