Fixed issue
Fixed function issue