Fixes commit 919eaaeb172ab58f90e20f103900ab679b1baa9a