Need static mapping fix