Fixed issues with spanX #1478