Fix Hierarchy Issue

Fixed the issue where some calls were getting overridden by the improper
call due to Hierarchy issues.