Slightly more robust fix for the last issue