Fixed some logic to use path