Fixed error linked to issue #1