#43 issue fix