Will also address this in next patch. Thanks!! :)