Cheap fix for #45