Refactor make compatible

What? Some reason for AtomicInteger here?