WIP: Minor fix