initial support for #55