Fix with statement