minor fix to make merge easier