Fix bug: for #13