trying to fix bug after merge