Fix by tisov