Updated some logic in fetch price