Fix for https://github.com/ferstaberinde/F3/issues/71