Fixed log and DRY