Fix for [SP + NW]