Added defaults that works with S4 dispatch
Fixed stupid bug... don't wanna explain