Should fix bad requests (i hope)