Fixed SoPa bug