Fixing slight issue in the last version, see comment.