JIP tweak as in https://github.com/ferstaberinde/F2/issues/66