changes regarding issue SAT-1256