Rebuilt to get rake happy