Fix after initial test