Avoid extra HEAD call in previous fix #12 and proper thanks to Scott White (whitews)