minor fix to past merge