fix with shop fields