fixed new behavior