Fixed according comments
Fixed function name - found during testing