fixing paths on all versions