[#44187261] Simplified the code