Fixes AGW-43