Address filepath issue