With his contract expiring at the end of this season Celtic could take away some of the concerns by adding 12 months onto his current deal to eliminate that issue from his thoughts.