Fix #46 Regression