Target class fix