! bug fix, works now, but needs better impl.