Try to fix modeshape issues