Add custom hook so debugging is useful again