Undid part of the last fix. Did not work as intended.