Fixing the call logic