v1.1.0.331 - implement #330 in a more sane way