Fix for parsing dot notation