Fixes commit a63d0009af9a85c1d52475a1a9bffda34302f0b0