Fixing values problem