trying to restore old behavior