merged little fix