__block creates duplicates

probably introduced by code written to fix #347