quick fix to forward correctly