Updated with version 1.0.6b of Ocelotl