Fixed bug in Maintenance handler due to namespace support