Quick fix and comment