Added cast back in since it works in Gotham