Modified previous commit to not break everything on most computers