Corrected issue 5

This fixes #5