Fix for STI commentable