Fix for milestone v0.8.1