Issue/scala code scanner correction

This one is rebased on #279