reverted to old behavior (had problems)