Anyway, this PR makes this code more future-proof, Thanka!