Added workaround to fix cuke 1.3.3+ bug