Style + #28 fix.