Changed fix as per bugzilla notes