Fix with big numbers