Fix #195 - removed direct method calls to Registry