Small fix to avoid bugs