Fixed at 0.8.1