Fixed manually after merge with master