Bug fix for buff extension