Added fix for supports (#34).