Fixed bug [#KAIKOMA-1 comments:test]