Issue #73 gefixt