Bugfix for Likun’s code.