This might fix problem where some object types are not properly detected.