Hack jupes in for now.

Someone rewrite the core to deal with these cases.