Implemented comment on task 5631