correctly fixed #26 (and #24 and #25)