LSL bug fixing