After scalania 25 #3 is fixed