Minor fix to current state