[#18] Verified fix