Fixed the resulting mess