fixed code that disappeared in a merge