Fix for second time