Fix #281. Port to 0.6.