fix to the const storage problem