Fix regression from 9ab67b88

issue #3 #5