Test #1 fix