Speed patch; moving out rsplit call