refactored redundant functions; removed optimized accessors for safety this fix also close #3178
Attach a file by drag & drop or click to upload
