anadiedrichs fix #66