Fixes Issue #7

Seeing if this fixes it...