Fix regression due to #183 fix...