fixing tool classes