Add back code that was lost