Ratchet 0.3.* fix