An incomplete/broken fix for 35/G line