BC-1441 #comment fixed some method again :)