Implement a somewhat less outrageous hack