fix: 1 error & 1 enhancement
* Custom path
* Error with Offset