Fix #23 Same fix for other function.