Bugfix for dotted notation