Fixed issue with following