Fixes Issue#1

Not the best way to fix this. But anyhow, fixes the issue.