Fix for quote problem