Minor bug fix from the code merger