double-check 0.5.7 fix