PIRANHA-1411 Code review fix