Upgrade to coffeestack 0.4