Fix for #2 Class not found