finally fixed yesterday's bug