Fix static chaining