Retain demo compatibility, phew!