Fixed #84 (fix from Diego)