update to work with new behavior