Fix for single quotes