change filament issue

make a more general solution