Fixed: issue #2