Fix for call in call expressions