Fix for 23b518bf3b3e96abeb8a5cfc9112daeff601e5f5