Update version of Cappuccino
Add Cappuccino bug temp workaround