Error related to #20 fixed