Fixed a bug related to #25