#15: new style fix