Added some hacks to get around filter rules