a simpler approach to handle @media #35