Fixing bugs related to prince 7.1.