Think I fixed OSX shared_ptr bug