Fixes a bug with regards to UDTs functionality