Fix lasses bugs