Modified system to make it proper include path