Buffer leak fixed. #141