Fixing one regression bug