Fixed compiler warning and cleaned up calling of attributes getter. #741
Merge branch 'od/issue_741' into develop