Fix Issue31