patch by Cora Lee