Brought up to 0.5.9