Minor fix (will be squashed in merge)