Fixing following functionality