Edge case fix when swaping constructors