Thanks Amitai Schleier for the patch