Fixing "always" issue