Reasonable fix for #28