Add comment and additional check