Fixes point a of #214