Temporary fix for duplication