diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index a5bcecd7..50a6fd21 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -1,9 +1,14 @@
 <idea-plugin url="https://github.com/koxudaxi/pydantic-pycharm-plugin">
     <id>com.koxudaxi.pydantic</id>
     <name>Pydantic</name>
-    <version>0.0.16</version>
+    <version>0.0.17</version>
     <vendor email="koaxudai@gmail.com">Koudai Aono @koxudaxi</vendor>
     <change-notes><![CDATA[
+    <h2>version 0.0.17</h2>
+    <p>BugFixes</p>
+    <ul>
+        <li>Fix removing fields on non-subclasses of pydantic.BaseModel and pydantic.dataclasses.dataclass [#62] </li>
+    </ul>
     <h2>version 0.0.16</h2>
     <p>Features, BugFixes</p>
     <ul>
diff --git a/src/com/koxudaxi/pydantic/PydanticCompletionContributor.kt b/src/com/koxudaxi/pydantic/PydanticCompletionContributor.kt
index 7c704aa8..bc43f6d9 100644
--- a/src/com/koxudaxi/pydantic/PydanticCompletionContributor.kt
+++ b/src/com/koxudaxi/pydantic/PydanticCompletionContributor.kt
@@ -142,6 +142,8 @@ class PydanticCompletionContributor : CompletionContributor() {
                                          pyClass: PyClass, typeEvalContext: TypeEvalContext,
                                          excludes: HashSet<String>? = null) {
 
+            if (!isPydanticModel(pyClass)) return
+
             val fieldElements: HashSet<String> = HashSet()
 
             pyClass.getAncestorClasses(typeEvalContext)
diff --git a/testData/completion/pythonClass.py b/testData/completion/pythonClass.py
new file mode 100644
index 00000000..16558e41
--- /dev/null
+++ b/testData/completion/pythonClass.py
@@ -0,0 +1,13 @@
+from builtins import *
+from pydantic import BaseModel
+
+class B:
+    hij: str
+
+class A:
+    abc: str
+    cde: str
+    efg: str
+
+
+A.<caret>
\ No newline at end of file
diff --git a/testSrc/com/koxudaxi/pydantic/PydanticCompletionTest.kt b/testSrc/com/koxudaxi/pydantic/PydanticCompletionTest.kt
index b7a4ff9f..981f02de 100644
--- a/testSrc/com/koxudaxi/pydantic/PydanticCompletionTest.kt
+++ b/testSrc/com/koxudaxi/pydantic/PydanticCompletionTest.kt
@@ -284,6 +284,16 @@ open class PydanticCompletionTest : PydanticTestCase() {
         )
     }
 
+    fun testPythonClass() {
+        doFieldTest(
+                listOf(
+                        Pair("abc", "A"),
+                        Pair("cde", "A"),
+                        Pair("efg", "A")
+                )
+        )
+    }
+
     fun testField() {
         doFieldTest(
                 listOf(