Trying to fix issue #332.