add 0.4 support