Works properly on 1.6 now