fixed error introduced in cleanups