DRY fix