Should fix issue #26