and smaaal bug fix