here is a additional fixes for #24