this looks like a bug not cleanup #1039