Small fix from master