fixed calculating current class