Temporary fix for visibility issue