To help solve issue #2