dadd42e574
Fix for #3607 and #3515
(cherry picked from commit 0750357916)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>