fixing double first call