Temporary fix for #297