Work around some issues until https://github.com/benwerd/bonita/issues/2 is resolved...