static mapping fix continues