Fix for #49.