Abstract class fix