update:
add missing portion of Agrabren's jellybean patch