Override, didn't work on home server

This version may or may not work properly.