Fixed some errors in the new behavior