Fix .hear
merging with master