Fixed lib/core remote and attached