Fix #1109.
Just how fucking difficult is it to integrate the catalog correctly?
/slap @desuwa