scala fix up