- Fixed code replication issue