Attempt at fixing lag