Simplified the bound field hack to something sensible