fix for #544