net.py is really the proper place to fix this