Fix complete message problem

fixes #28