applied patch From Jeff