[s2p] temporary fix