fixed duplicate calls