Fixed #68(FreeBSD issue)

Re-merge for fixing mis-mere at #70 #71