Fix #5

Fixes Issue #5