Updated: do not depend on relative path