Fix bug related to #1a11756aa4f16acd4336eba77d15b4911155471a