Fixed regression bugs (STOX-31)