Finished fix described in commit 61faf65