Fix related to #329