better apostraphe support