Should Hopefully fix Issue #1