poor fix for the repository - bad bad performance