Final clop fix hopefully