patch #94
patch #94 for real