Slightly better but still horrible path checking