Added dwb fix