Fix issue #59

third attempt