final bug fix from client