Fix bugs #14