Fixed issues for clop