fix for #147
merge