Fix for #49