Fixed to work with scala 2.10