Fix 0.2 compatibility. See #311