[master] proper fix for static-modules problem