BUG: fix change of behavior in last commit