First fix for module (ADWD-905)