Fix for byte-compile