Fixed #91, #187.