Trying to fix issue #411