fix for activate bug