Fixed function call exceptions because of too big statements