tweaks. related to issue #288