preliminary attempt at fixing