Fix for POJOs with dependency loop in constructors