Added const qualifier for FS#7