Alternative fix that actuall works.