Fix for 4bad40d027d6e0b196a1d7c7facac44fec4df1a2