Rebuilt lib for safety's sake