Apply patch from 0.25.1