Fix #3624 (cherry picked from commit 06db5f8bca) Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
06db5f8bca