Fix regression

Due to Issue #38