Fixed bits to get system working with default-assignment-handler.