EUCA-6559 fix problems created by commit 02ded6bd39ec9cdddce4992c0d3a7577df265f40