[#67871860] refactored