Patch by "cuppatea" (SF #1503765)