EUCA-6481
fixed default case