manual pull from j4jackj's fixes, +r still doesn't work but at least server doesn't segfault