Added RhinoDuck's fix (well, the concept of it)

As all of the original properties and structs are gone, I used the logic to implement similar code.