BC-1296 #comment goint to fix classes