Fixing broken unwrapping constructor