Fixed bug related to #191