Fixed the recently introduced (final version?)