#491: replace the generic device