Fixing "Activity" bug