tweaks. #377, #376