Mahendra | #731 | fixing configs