Fixing very agressive static type inference