Fix forwards not being created correctly