Possible fix for an issue found by @zyga