Fixed spans again