fork repairing some errors