Fixing active status problem