Fixed non-valid object types