sync with bacon 0.6.22