Re fix and add log