Fixing a bug related to #28.