Cobbles (finally) fix