removed a bug with activation