IssueID #31 : bugfix within ENABLE_CAMERA codes