Dirty hack for 1.7