fix scala 2.10.0
realign with master