Fixed hbck to work with replicas