Improve previous bytecomp fix