Compatible with latest apostrophe