Better (but still questionable) hack