Bug fix for d4e649a4