this should fix #27 ; more to do?