refraction issue partially fixed