Fix for #70

This change fixes #70