Made it work... again