Minor compatibility hack and bump to 1.0.7