Fix bug in commit a274ae5a6edc7dc7a52ec1c132e52b9ce706e01d