This patch seems a bit ugly, maybe it would be a bit cleaner with gotos.
Attach a file by drag & drop or click to upload
