Fixed bug with cig store, copy bugs