Fixes option for custom store classes