- Fixed mapping of dummies