Trying to fix issue #519