Fixed bug in following functionality