align with scala 2.11