8/14 D: minor desing fix