Another fix for embedded dot syntax