Fixed compile error

Fixed an accidental compile error that happened during manual merging.