Custom hook temporary fix