Return old behavior