change after review from milkypostman/melpa#1773