Bug fixed for ZLL