Fix related to #581