fix for CEP-983