Fixes #243

Fixes Bad Class name and copied code to us are new class.