patch from 2.0.4-alpha