Moving fix by Tony Tkacik in the stable/lithium branch which caused an error with...