Should probably be strict - why was this disabled?