Change implementation to limit bugs