Fix static and dynamic part