Fix and added current class