Corrected after @danigiri revision