reverted to old behavior