diff --git a/CMakeLists.txt b/CMakeLists.txt
index 431aabd7..9f9a9179 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,7 @@ endif()
 
 if(STATIC_LIB)
 	set(PIP_LIB_TYPE STATIC)
+	add_definitions(-DPIP_STATIC_DEFINE)
 	message(STATUS "Building PIP static library")
 else()
 	set(PIP_LIB_TYPE SHARED)
diff --git a/src_main/concurrent/executor.h b/src_main/concurrent/executor.h
index f4568af0..aee36030 100644
--- a/src_main/concurrent/executor.h
+++ b/src_main/concurrent/executor.h
@@ -1,7 +1,3 @@
-//
-// Created by fomenko on 20.09.2019.
-//
-
 #ifndef PIP_TESTS_EXECUTOR_H
 #define PIP_TESTS_EXECUTOR_H
 
diff --git a/src_main/core/piobject.h b/src_main/core/piobject.h
index cfa77b5c..7c7e33af 100755
--- a/src_main/core/piobject.h
+++ b/src_main/core/piobject.h
@@ -785,7 +785,6 @@ public:
 	bool isPIObject() const {return isPIObject(this);}
 	template<typename T>
 	bool isTypeOf() const {
-		if (!this) return false;
 		if (!isPIObject()) return false;
 		return scopeList().contains(T::__classNameS());
 	}