fixed more constraints