Castle definitely needs to fix this