Fix related to #33