Revert of last changes (apart from string copy) - worked on OS X but not Linux.