drop to support 0.6