Include latest fix by Thomas Andraschko