Same problem here, DRY this out.