Fix for related store