Fix for #24

This fixes #24

Thank you.