Fix with scheduler