Fixed issue with string splitting