Attempt to fix current setup problems :(