#357, #334 addressed