bug in storing mechanism fixed