hotfixes for #17