Bug fix after formating code