Removed the special case  property