fixed jade 0.33 related issues
merging