Updated after fix to issue #2