fix the issues appointed by @rakyll