cosmetics + fixed issue #183