Fixed fork quoting problems