Fixed #31,30