Added code that disappeared in the merge