Fixing #6

This fixes #6