#112 Fixed attributes