Mini fix (only implementation comments)