Extend fc3a836 to handle Q encoding case