Implemented fix by Tyler Hawe <t.hawe@gerawan.com>