Fixed issue with nil text