Minor patch with logging and group